Unify jdbc tests between javaagent and library instrumentation #15137
Conversation
github-actions
bot
added
the
test native
trask
force-pushed
the
unify-jdbc-tests-2
branch
3 times, most recently
from
f58e9d4 to
a253c52
Compare
trask
force-pushed
the
unify-jdbc-tests-2
branch
from
9436596 to
fefd71f
Compare
trask
force-pushed
the
unify-jdbc-tests-2
branch
4 times, most recently
from
10efdf0 to
c0f03e4
Compare
trask
force-pushed
the
unify-jdbc-tests-2
branch
from
c0f03e4 to
9d2feb2
Compare
trask
force-pushed
the
unify-jdbc-tests-2
branch
from
2d63bcd to
6e4b8c0
Compare
There was a problem hiding this comment.
only change compared to the old javaagent PreparedStatementParametersTest is calling wrap()
| if (init != null) { | ||
| init.accept(ds); | ||
| } | ||
| Class<?> originalDatasourceClass = ds.getClass(); |
There was a problem hiding this comment.
capturing the original class here before to use in verification later
There was a problem hiding this comment.
only changes compared to the old javaagent JdbcInstrumentationTest are calling wrap() and a couple of other minor changes noted by review comments
| return Stream.of( | ||
| Arguments.of( | ||
| new JdbcDataSource(), | ||
| (Consumer<DataSource>) ds -> ((JdbcDataSource) ds).setURL(jdbcUrls.get("h2")), |
There was a problem hiding this comment.
this changed from setUrl in the javaagent test to setURL in this module because in the javaagent module, h2 version is overridden for slick test
| try { | ||
| ds.setDriverClass(jdbcDriverClassNames.get(dbType)); | ||
| } catch (PropertyVetoException e) { | ||
| throw new IllegalStateException(e); |
There was a problem hiding this comment.
this changed from RuntimeException to IllegalStateException b/c it's now in src/main and so errorprone rules apply
|
|
||
| @SuppressWarnings("deprecation") // using deprecated semconv | ||
| class DruicDataSourceTest { | ||
| class DruidDataSourceTest { |
| private String url; | ||
| Consumer<String> sqlConsumer = unused -> {}; | ||
|
|
||
| public TestConnection() {} | ||
| private final String url; | ||
| private final Consumer<String> sqlConsumer; |
There was a problem hiding this comment.
removed tests from here that are now covered by the shared tests
There was a problem hiding this comment.
only change compared to the old javaagent PreparedStatementParametersTest is calling wrap()
1 participant
No description provided.